Layout changes

Slowly making my way towards using fragments, like I should've been all
along