Reworked main layout, going to transition to fragments so I can add
preferences in. Committing before the first major fragment change