UI and monitoring related behaviour changes