Merge pull request #1 from pankuleczka/master

css/layout tweaks
aligning with new namespaces
Merge pull request #2 from paolovergori/master

APPLAT-1