Switched from divs to ul/li and some language improvements