Updates to Design and layout