refactoring querying courses
merged conflicts
restructured course display
merged in new query page
Merge branch 'refactor-query'