New html structure and other theme updates