Small changes and fixes in monitor view.