Merge branch 'hotfix/ugly_list_page' into develop
Required to deployify
Merge branch 'develop'