Incorporate Manpreet's style and layout changes