Completely changed css and html tag organization