design fixes

design fixes