Updated view
Removed unnecessary code
Altered text filter
Theming