Random changes to the cms and frontend