Subnav added and some cleaning