Refactored some views