Working on results page; things are organized
Fixing conflict