Monitoring - UI redesign and refactor