improve overall design