Done modifications to administration area and UI