refactor UI per Mike's comments