[Client] More UI fixes
Merge branch 'feature/plugin-server' of github.com:usersource/anno into feature/plugin-server