Final design fixes