Moving more logic to views.
Extra space caused conflict.