Fixed a positioning bug with webkit
Reorganized the CSS in the template files