Some more optimizations
Put more methods in view, to keep controller simple