Final design changes