More updates, css and tpl