Lots of improvements | Finally shaping up admin