GTNPORTAL-2968 - applying design changes

Fixing merge issues from previous PRs:
https://github.com/gatein/gatein-portal/pull/448/
https://github.com/gatein/gatein-portal/pull/445/