change some styles
refactor routing pt 1