GTNPORTAL-3027 Adapting changes to work with mobile