Removed some extra code & fix some divs