Bugfix, html/css improvements