Merge branch 'ui-redesign' into modules
Fixed a bug in rendering config page
Merge branch 'modules' of github.com:scrollback/scrollback into modules