Added new design fixes