Admin View bugfixes
Merge branch 'master' of https://github.com/Sarna555/ProjectBD