Added settings page for user
Fixed conflict