[REFACTOR] Tidy up and added administration panel