Added design fixes