Ux improvements

https://issues.jboss.org/browse/AGPUSH-935
https://issues.jboss.org/browse/AGPUSH-936