Mentor popups and style simplifications