Added admin features and some other minor changes