categorylist: layout
Merge branch 'development' of https://github.com/jan-vandorpe/mctesting.git into development