Fixed the monitor page
Merge branch 'dev'