Fixed bugs and completed add/delete functionality
Fixed merge conflicts over accessing admin interface