UI bugfixes
Merge branch 'web-rewrite'