[CLEANUP] Clean up dangling barnacles in the storyboard, views that lead nowwhere, etc. Arrange for easy comprehension of the view hierarchies