Composition Screen Changes

Navigation flow changes made.