show page starting to look good
merge