Adding router and second phase
Layout enhancements
Routes for displayMode