Removed the layouts from _s because I wasn't using them