Refactored View/Edit Composition pages