Some fixes for my WIP

- Fixed some HTML structure issues
- Found and implemented workaround for the UI pane vanishing in Chrome
  in certain situations
Fix option handling, templates broke it