REVIEW: [NEXUS-6807][NEXUS-6807] User ui fixes

https://issues.sonatype.org/browse/NEXUS-6807
https://issues.sonatype.org/browse/NEXUS-6808