Admin updates & frontend updates
Merge branch 'master' of https://github.com/thenhkid/icsciences