Overall design fixes