Various fixes to views markup and labels