Features & fixes

Various features and fixes for the CMS.