Small changes to views.
More code cleanup. Back to basics.