UI and copy review
Merge branch 'dev' of github.com:novius-os/novius-os into dev