Cleaned up more views and get them to a complete stage