Improve UI a bit

Reduce the amount of rich:panel's, add some icons.