Various cshtml changes