UI polish

This PR contains : 

https://issues.jboss.org/browse/AGPUSH-436
https://issues.jboss.org/browse/AGPUSH-435
https://issues.jboss.org/browse/AGPUSH-434