li -> divs
merge conflits
style tweaks.