Changes from meeting with Todd Willey to adhere to better practices.
Merged view updates with current code.