Cleaned up views and layouts

Made some minor changes for the testing today