Added ERb to the Views and Refactored them