rework some of the user presentation code