Latest design changes applied