Restructured to improve usability and style
Improved navigation  on small viewport