Edited and refactored views.