more ui tweaking
refactored guts of rollup logic.