Added some validations
Made /settings route, organized routes