more stuff
Cleaned up UI and routing