fixing merge
merging stuff
results page
layouts for results