Cleaned up some views and fixed any failing tests