bug fixes around edge case of people switching around the display elements they're using