design fixes and cancel build