Remove derp and fix layout