Eliminate part of helpers & integrate in views.

Add more logic & a touch of style