design fixes
design fixes2