Fixed some bugs with HTML5 and navbar