major fixes to update to new design