Merge admin panel to master, fixes and improvements

Closes #48, closes #49, fixes #50 

Merges admin panel to master, additional fixes.