* Minor design fixes
