cleaned up display. still need pre-notifications