No more LI, using divs now.
heavy refactoring, but much cleaner