Added user settings controller and removed group