Cleaning up the theme

deleted some unneeded views,started cleaning up the layout building, moving things into functions and adding comments to eventually turn things into classes