Updated layout, did some configuration, cleaned it up