Clean up a lot of views and added some icons