User rank added and minor fixes
FIXES, better separation, enhancing MVC.