Changing over to the new layout