Redesigned MainActivity layout. Not yet finished though!
Merge remote-tracking branch 'origin/master'