minor views, layout and routes adjustments
refactoring