Various UI changes and code cleanup
Rebuild for gh pages