design fixes2