further updates based on feedback from commit [AEROGEAR-1228]

commit comments:
https://github.com/aerogear/aerogear.org/commit/8b1c17b31