fix sizing and naming