Project cleanup, design fixes