Changed to navigation bar and added second query