Fixed positioning issue
Refactored some divs