Refactoring (Forgot about _Layout.chstml, as added in extra markup)