GTNPORTAL-2917 Fixing final details.