Fixes #177 + various ui fixes
Part of #114
Fixes #202 (hopefully)