More work
Clean up the view
Tested with 1.8, still in progress