Revert "Some fixes"

This reverts commit 5e404fbb1c8f2879a36ffe62af69ecfc315228aa.
Revert "Administration design"

This reverts commit 4b1c01cb184554d9f318a2f08445d1e32325e363.