Tiny refactor
Refactor view. Remove duplicate stuff
Move hokey logic to controller