Merging with Robert's design changes
homepage polishing