Alignment tweaks
CMS permission updates