New MainActivity layout

Closes #22