Some gui alignment and cleanup