design fixes by QA