code and UI cleanup
refactored to use routes instead of a one main route