reworked and fixed management screens