Refactored view and fixed composer