Moved my changes over to the base layout