Fixed query
Added Notification Settings to the main menu