Layout and respository housekeeping