Refactored views and added fixtures