Minor redesign, removed foundation default stuff