Multiple design fixes