Page feature on website + minor design changes
Merge