Some markup updates for the different level status views