Edited aliases to enable use of HtmlBuilder and modified views accordingly.