LOTS of view/controller refactoring + some CSS: not everything might be fully functional
merged admin controller