GTNPORTAL-2858 finishing CSS and code refactoring