Fixes in layout + fixed sorting of filtered results
Merge branch 'develop' into forge-3122
Merge branch 'forge-3122' into develop