Cleaned up some controller logic. Added error messages to views.