merge feature{#46-polish-app-interface} into master

closes #46, bullet point 1 and 3 are done on Behnaz's branch