Few design fixes.