Fixes and added admin menu