Reworked element positions
Simplified markup
Cleanup