design fixes and alignment fixes