Code optimization
1.7
ul tags replaced with divs for better organization
Revert