Updated display, organized UI code