Added small design changes