diff --git a/package-lock.json b/package-lock.json
index a06d90735..30bc4b9a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8339,9 +8339,9 @@
       }
     },
     "openstack-uicore-foundation": {
-      "version": "2.0.47",
-      "resolved": "https://registry.npmjs.org/openstack-uicore-foundation/-/openstack-uicore-foundation-2.0.47.tgz",
-      "integrity": "sha512-hOr+G+gPc5crTKTy0AmNyff+rfCloC2kUGUdBwJ1dmjOJN8bZPqYX+g48a7PJ9zkOk9wi8UIugf7fXtblsvrdg=="
+      "version": "2.0.54",
+      "resolved": "https://registry.npmjs.org/openstack-uicore-foundation/-/openstack-uicore-foundation-2.0.54.tgz",
+      "integrity": "sha512-d7mCJr4vxiAL/a17dDYY8NE4S+fy3tiK2K5HoO1CcTWYNsG48jvATjl9SAWSkOK1bEWJvHNaigc4fMsEpnBEzw=="
     },
     "opn": {
       "version": "5.5.0",
diff --git a/package.json b/package.json
index 5705b7676..b8440d320 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "moment": "^2.22.2",
     "moment-timezone": "^0.5.28",
     "node-sass": "^4.14.1",
-    "openstack-uicore-foundation": "^2.0.47",
+    "openstack-uicore-foundation": "^2.0.54",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "postcss-loader": "^2.1.6",
     "react": "^16.13.1",
diff --git a/src/actions/summit-actions.js b/src/actions/summit-actions.js
index 89d5d7b2e..e9a9e91a4 100644
--- a/src/actions/summit-actions.js
+++ b/src/actions/summit-actions.js
@@ -32,6 +32,8 @@ export const REQUEST_SUMMIT           = 'REQUEST_SUMMIT';
 export const RECEIVE_SUMMIT           = 'RECEIVE_SUMMIT';
 export const REQUEST_SUMMITS          = 'REQUEST_SUMMITS';
 export const RECEIVE_SUMMITS          = 'RECEIVE_SUMMITS';
+export const REQUEST_ALL_SUMMITS      = 'REQUEST_ALL_SUMMITS';
+export const RECEIVE_ALL_SUMMITS      = 'RECEIVE_ALL_SUMMITS';
 export const SET_CURRENT_SUMMIT       = 'SET_CURRENT_SUMMIT';
 export const RESET_SUMMIT_FORM        = 'RESET_SUMMIT_FORM';
 export const UPDATE_SUMMIT            = 'UPDATE_SUMMIT';
@@ -121,6 +123,28 @@ export const loadSummits = (page = 1, perPage = 10) => (dispatch, getState) => {
     );
 }
 
+export const getAllSummits = () => (dispatch, getState) => {
+
+    let { loggedUserState } = getState();
+    let { accessToken }     = loggedUserState;
+
+    let params = {
+        access_token : accessToken,
+        expand: 'none',
+        relations: 'none',
+        page: 1,
+        per_page: 100,
+        order: '-id',
+    };
+
+    getRequest(
+        createAction(REQUEST_ALL_SUMMITS),
+        createAction(RECEIVE_ALL_SUMMITS),
+        `${window.API_BASE_URL}/api/v1/summits/all`,
+        authErrorHandler
+    )(params)(dispatch, getState);
+}
+
 export const resetSummitForm = () => (dispatch, getState) => {
     dispatch(createAction(RESET_SUMMIT_FORM)({}));
 };
diff --git a/src/actions/summit-builder-actions.js b/src/actions/summit-builder-actions.js
index 61cca4db5..6405b492b 100644
--- a/src/actions/summit-builder-actions.js
+++ b/src/actions/summit-builder-actions.js
@@ -37,6 +37,7 @@ export const CHANGE_CURRENT_LOCATION                      = 'CHANGE_CURRENT_LOCA
 export const CHANGE_CURRENT_EVENT_TYPE                    = 'CHANGE_CURRENT_EVENT_TYPE';
 export const CHANGE_CURRENT_TRACK                         = 'CHANGE_CURRENT_TRACK';
 export const CHANGE_CURRENT_PRESENTATION_SELECTION_STATUS = 'CHANGE_CURRENT_PRESENTATION_SELECTION_STATUS';
+export const CHANGE_CURRENT_PRESENTATION_SELECTION_PLAN   = 'CHANGE_CURRENT_PRESENTATION_SELECTION_PLAN';
 export const CHANGE_CURRENT_UNSCHEDULE_SEARCH_TERM        = 'CHANGE_CURRENT_UNSCHEDULE_SEARCH_TERM';
 export const CHANGE_CURRENT_SCHEDULE_SEARCH_TERM          = 'CHANGE_CURRENT_SCHEDULE_SEARCH_TERM';
 export const CHANGE_CURRENT_ORDER_BY                      = 'CHANGE_CURRENT_ORDER_BY';
@@ -54,6 +55,7 @@ export const getUnScheduleEventsPage =
         event_type_id    = null,
         track_id         = null,
         selection_status = null,
+        selection_plan   = null,
         term             = null,
         order            = null
     ) =>
@@ -76,6 +78,10 @@ export const getUnScheduleEventsPage =
             filter.push(`selection_status==${selection_status}`);
         }
 
+        if(selection_plan != null){
+            filter.push(`selection_plan_id==${selection_plan}`);
+        }
+
         if(term){
             let escapedTerm = escapeFilterValue(term);
             filter.push(`title=@${escapedTerm},abstract=@${escapedTerm},social_summary=@${escapedTerm},tags=@${escapedTerm},speaker=@${escapedTerm},speaker_email=@${escapedTerm},id==${escapedTerm}`);
@@ -219,6 +225,15 @@ export const changeCurrentPresentationSelectionStatus = (currentPresentationSele
     ));
 }
 
+export const changeCurrentPresentationSelectionPlan = (currentPresentationSelectionPlan) => (dispatch, getState) => {
+
+    dispatch(createAction(CHANGE_CURRENT_PRESENTATION_SELECTION_PLAN)(
+        {
+            presentationSelectionPlan: currentPresentationSelectionPlan
+        }
+    ));
+}
+
 export const changeCurrentUnScheduleOrderBy = (orderBy) => (dispatch, getState) => {
 
     dispatch(createAction(CHANGE_CURRENT_ORDER_BY)(
diff --git a/src/actions/tag-actions.js b/src/actions/tag-actions.js
index 34287be04..35769257e 100644
--- a/src/actions/tag-actions.js
+++ b/src/actions/tag-actions.js
@@ -103,7 +103,7 @@ export const getTagGroup = (tagGroupId) => (dispatch, getState) => {
     dispatch(startLoading());
 
     let params = {
-        expand       : 'allowed_tags,tag',
+        expand       : 'allowed_tags, allowed_tags.tag',
         access_token : accessToken,
     };
 
diff --git a/src/app.js b/src/app.js
index 6dcce2756..8137b082e 100644
--- a/src/app.js
+++ b/src/app.js
@@ -26,7 +26,7 @@ import T from 'i18n-react';
 import CustomErrorPage from "./pages/custom-error-page";
 import history from './history'
 import exclusiveSections from 'js-yaml-loader!./exclusive-sections.yml';
-
+import IdTokenVerifier from 'idtoken-verifier';
 
 
 // here is set by default user lang as en
@@ -73,8 +73,20 @@ class App extends React.PureComponent {
     }
 
     render() {
-        let { isLoggedUser, onUserAuth, doLogout, getUserInfo, member, backUrl, loading} = this.props;
-        let profile_pic = member ? member.pic : '';
+        let { isLoggedUser, onUserAuth, doLogout, getUserInfo, idToken, backUrl, loading} = this.props;
+
+
+        // get user pic from idtoken claims (IDP)
+        let profile_pic = '';
+
+        if(idToken){
+            let verifier = new IdTokenVerifier({
+                issuer:   window.IDP_BASE_URL,
+                audience: window.OAUTH2_CLIENT_ID
+            });
+            let jwt = verifier.decode(idToken);
+            profile_pic = jwt.payload.picture;
+        }
 
         return (
             <Router history={history}>
@@ -111,6 +123,7 @@ const mapStateToProps = ({ loggedUserState, baseState }) => ({
     isLoggedUser: loggedUserState.isLoggedUser,
     backUrl: loggedUserState.backUrl,
     member: loggedUserState.member,
+    idToken:  loggedUserState.idToken,
     loading : baseState.loading,
 });
 
diff --git a/src/components/forms/event-form.js b/src/components/forms/event-form.js
index 5a1b001c2..1b6710b9f 100644
--- a/src/components/forms/event-form.js
+++ b/src/components/forms/event-form.js
@@ -231,7 +231,14 @@ class EventForm extends React.Component {
 
         let levels_ddl = levelOpts.map(l => ({label: l, value: l}));
 
-        let selection_plans_ddl = selectionPlansOpts.map(sp => ({label: sp.name, value: sp.id}));
+        let selection_plans_ddl = [];
+
+        if (entity.track_id) {
+            const track = trackOpts.find(t => t.id === entity.track_id);
+            selection_plans_ddl = selectionPlansOpts
+                .filter(sp => sp.track_groups.some(gr => track.track_groups.includes(gr)))
+                .map(sp => ({label: sp.name, value: sp.id}));
+        }
 
         let rsvp_templates_ddl = rsvpTemplateOpts.map(
             t => {
@@ -525,15 +532,18 @@ class EventForm extends React.Component {
                        handleClick={this.toggleSection.bind(this, 'live')}>
                     <div className="row form-group">
                         <div className="col-md-6">
-                            <label> {T.translate("edit_event.streaming_url")}&nbsp;<i className="fa fa-info-circle"
-                                                                                aria-hidden="true" title={T.translate("edit_event.streaming_url_info")}></i></label>
+                            <label>
+                                {T.translate("edit_event.streaming_url")}&nbsp;
+                                <i className="fa fa-info-circle" aria-hidden="true" title={T.translate("edit_event.streaming_url_info")} />
+                            </label>
                             <input className="form-control" id="streaming_url" value={entity.streaming_url} onChange={this.handleChange} />
                         </div>
                      </div>
                     <div className="row form-group">
                         <div className="col-md-6">
-                            <label> {T.translate("edit_event.meeting_url")}&nbsp;<i className="fa fa-info-circle"
-                                                                                      aria-hidden="true" title={T.translate("edit_event.meeting_url_info")}></i></label>
+                            <label> {T.translate("edit_event.meeting_url")}&nbsp;
+                                <i className="fa fa-info-circle" aria-hidden="true" title={T.translate("edit_event.meeting_url_info")} />
+                            </label>
                             <input className="form-control" id="meeting_url" value={entity.meeting_url} onChange={this.handleChange} />
                         </div>
                     </div>
diff --git a/src/components/forms/selection-plan-form.js b/src/components/forms/selection-plan-form.js
index 1ac3c6b7f..d682a58ec 100644
--- a/src/components/forms/selection-plan-form.js
+++ b/src/components/forms/selection-plan-form.js
@@ -142,6 +142,7 @@ class SelectionPlanForm extends React.Component {
                             id="max_submission_allowed_per_user"
                             value={entity.max_submission_allowed_per_user}
                             onChange={this.handleChange}
+                            min={0}
                         />
                     </div>
                     <div className="col-md-3 checkboxes-div">
diff --git a/src/components/forms/summit-form.js b/src/components/forms/summit-form.js
index 71558a166..2205a8079 100644
--- a/src/components/forms/summit-form.js
+++ b/src/components/forms/summit-form.js
@@ -382,7 +382,6 @@ class SummitForm extends React.Component {
                                 onChange={this.handleChange}
                                 format={{date:"YYYY-MM-DD", time: "HH:mm"}}
                                 timezone={entity.time_zone_id}
-                                timeConstraints={{ hours: { min: 7, max: 22}}}
                                 value={epochToMomentTimeZone(entity.start_date, entity.time_zone_id)}
                                 error={this.hasErrors('start_date')}
                             />
@@ -395,7 +394,6 @@ class SummitForm extends React.Component {
                                 onChange={this.handleChange}
                                 format={{date:"YYYY-MM-DD", time: "HH:mm"}}
                                 timezone={entity.time_zone_id}
-                                timeConstraints={{ hours: { min: 7, max: 22}}}
                                 value={epochToMomentTimeZone(entity.end_date, entity.time_zone_id)}
                                 error={this.hasErrors('end_date')}
                             />
diff --git a/src/components/inputs/question-answers-input.js b/src/components/inputs/question-answers-input.js
index 7c167fdb9..f779ca35c 100644
--- a/src/components/inputs/question-answers-input.js
+++ b/src/components/inputs/question-answers-input.js
@@ -23,9 +23,8 @@ export default class QuestionAnswersInput extends React.Component {
 
         let answers = props.questions.map(q => {
             let defaultValue = (q.type == 'CheckBox') ? 'false' : '';
-
             let answer = props.answers.find(ans => ans.question_id == q.id);
-            let value = answer ? answer.value : defaultValue;
+            let value = answer ? answer.answer : defaultValue;
             return ({question_id: q.id, answer: value});
         });
 
diff --git a/src/components/schedule-builder/bulk-actions/schedule-admin-bulk-actions-selector.js b/src/components/schedule-builder/bulk-actions/schedule-admin-bulk-actions-selector.js
index d30df3397..97f6301a0 100644
--- a/src/components/schedule-builder/bulk-actions/schedule-admin-bulk-actions-selector.js
+++ b/src/components/schedule-builder/bulk-actions/schedule-admin-bulk-actions-selector.js
@@ -26,7 +26,7 @@ class ScheduleAdminsBulkActionsSelector extends React.Component {
         let { onSelectAll, bulkOptions } = this.props;
         return (
             <div className="row bulk-actions-selector-container">
-                <div className="col-md-6">
+                <div className="col-md-8">
                     <input type="checkbox" onClick={onSelectAll}/>
                     <select ref={(select) => { this.actionTypeSelect = select; }}>
                         <option value="">{T.translate("published_bulk_actions_selector.options.default")}</option>
@@ -37,7 +37,7 @@ class ScheduleAdminsBulkActionsSelector extends React.Component {
                         }
                     </select>
                 </div>
-                <div className="col-md-6">
+                <div className="col-md-4">
                     <button onClick={this.onPerformBulkAction.bind(this)} title={ T.translate("published_bulk_actions_selector.titles.go")} className="btn btn-default btn-sm">
                         <i className="fa fa-play">&nbsp;{T.translate("published_bulk_actions_selector.buttons.go")}</i>
                     </button>
diff --git a/src/components/schedule-builder/schedule-admin-dashboard.js b/src/components/schedule-builder/schedule-admin-dashboard.js
index 498713916..f40fc9ea8 100644
--- a/src/components/schedule-builder/schedule-admin-dashboard.js
+++ b/src/components/schedule-builder/schedule-admin-dashboard.js
@@ -24,6 +24,7 @@ import {
     changeCurrentEventType,
     changeCurrentTrack,
     changeCurrentPresentationSelectionStatus,
+    changeCurrentPresentationSelectionPlan,
     changeCurrentUnscheduleSearchTerm,
     unPublishEvent,
     changeCurrentScheduleSearchTerm,
@@ -47,6 +48,7 @@ import ScheduleAdminVenueSelector from './schedule-admin-venue-selector';
 import ScheduleAdminEventTypeSelector from './schedule-admin-event-type-selector';
 import ScheduleAdminTrackSelector from './schedule-admin-track-selector';
 import ScheduleAdminPresentationSelectionStatusSelector from './schedule-admin-presentation-selection-status-selector';
+import ScheduleAdminPresentationSelectionPlanSelector from './schedule-admin-presentation-selection-plan-selector';
 import ScheduleAdminSearchFreeTextUnScheduleEvents from './schedule-admin-search-free-text-unschedule-events';
 import ScheduleAdminSearchFreeTextScheduleEvents from './schedule-admin-search-free-text-schedule-events';
 import ScheduleAdminScheduleEventsSearchResults from './schedule-admin-schedule-events-search-results';
@@ -74,6 +76,7 @@ class ScheduleAdminDashBoard extends React.Component {
         this.onEventTypeChanged                   = this.onEventTypeChanged.bind(this);
         this.onTrackChanged                       = this.onTrackChanged.bind(this);
         this.onPresentationSelectionStatusChanged = this.onPresentationSelectionStatusChanged.bind(this);
+        this.onPresentationSelectionPlanChanged   = this.onPresentationSelectionPlanChanged.bind(this);
         this.onUnscheduledEventsFilterTextChanged = this.onUnscheduledEventsFilterTextChanged.bind(this);
         this.onUnPublishEvent                     = this.onUnPublishEvent.bind(this);
         this.onScheduledEventsFilterTextChanged   = this.onScheduledEventsFilterTextChanged.bind(this);
@@ -137,12 +140,12 @@ class ScheduleAdminDashBoard extends React.Component {
 
     componentDidMount(){
 
-        let { currentSummit, currentEventType, currentTrack, currentPresentationSelectionStatus, currentDay, currentLocation, scheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy } = this.props;
+        let { currentSummit, currentEventType, currentTrack, currentPresentationSelectionStatus, currentPresentationSelectionPlan, currentDay, currentLocation, scheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy } = this.props;
         if(!currentSummit.id) return;
 
         let eventTypeId = currentEventType == null ? null : currentEventType.id;
         let trackId     = currentTrack == null ? null : currentTrack.id;
-        this.props.getUnScheduleEventsPage(currentSummit.id, 1, 20, eventTypeId, trackId, currentPresentationSelectionStatus, '', currentUnScheduleOrderBy);
+        this.props.getUnScheduleEventsPage(currentSummit.id, 1, 20, eventTypeId, trackId, currentPresentationSelectionStatus, currentPresentationSelectionPlan,'', currentUnScheduleOrderBy);
 
         if(this.filters.hasOwnProperty('currentScheduleEventsSearchTerm')) {
             scheduleEventsCurrentSearchTerm = this.filters['currentScheduleEventsSearchTerm'];
@@ -240,14 +243,14 @@ class ScheduleAdminDashBoard extends React.Component {
     }
 
     onUnScheduleEventsPageChange(currentPage){
-        let { currentSummit, currentTrack, currentEventType , currentPresentationSelectionStatus, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy} = this.props;
+        let { currentSummit, currentTrack, currentEventType , currentPresentationSelectionStatus, currentPresentationSelectionPlan, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy} = this.props;
         let trackId = currentTrack == null ? null : currentTrack.id;
         let eventTypeId = currentEventType == null ? null : currentEventType.id;
-        this.props.getUnScheduleEventsPage(currentSummit.id, currentPage, 20, eventTypeId, trackId, currentPresentationSelectionStatus, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy);
+        this.props.getUnScheduleEventsPage(currentSummit.id, currentPage, 20, eventTypeId, trackId, currentPresentationSelectionStatus, currentPresentationSelectionPlan, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy);
     }
 
     onEventTypeChanged(eventType){
-        let { currentSummit, currentTrack, currentPresentationSelectionStatus, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy} = this.props;
+        let { currentSummit, currentTrack, currentPresentationSelectionStatus, currentPresentationSelectionPlan, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy} = this.props;
         let trackId = currentTrack == null ? null : currentTrack.id;
         let eventTypeId = eventType == null ? null : eventType.id;
         let selectionStatus = currentPresentationSelectionStatus;
@@ -259,19 +262,19 @@ class ScheduleAdminDashBoard extends React.Component {
             this.props.changeCurrentUnScheduleOrderBy(order);
         }
         this.props.changeCurrentEventType(eventType);
-        this.props.getUnScheduleEventsPage(currentSummit.id, 1, 20, eventTypeId, trackId, selectionStatus, unScheduleEventsCurrentSearchTerm, order);
+        this.props.getUnScheduleEventsPage(currentSummit.id, 1, 20, eventTypeId, trackId, selectionStatus, currentPresentationSelectionPlan, unScheduleEventsCurrentSearchTerm, order);
     }
 
     onTrackChanged(track){
-        let { currentSummit, currentEventType , currentPresentationSelectionStatus, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy} = this.props;
+        let { currentSummit, currentEventType , currentPresentationSelectionStatus, currentPresentationSelectionPlan, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy} = this.props;
         let eventTypeId = currentEventType == null ? null : currentEventType.id;
         let trackId     = track == null ? null : track.id;
         this.props.changeCurrentTrack(track);
-        this.props.getUnScheduleEventsPage(currentSummit.id, 1, 20, eventTypeId, trackId, currentPresentationSelectionStatus, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy);
+        this.props.getUnScheduleEventsPage(currentSummit.id, 1, 20, eventTypeId, trackId, currentPresentationSelectionStatus, currentPresentationSelectionPlan, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy);
     }
 
     onPresentationSelectionStatusChanged(presentationSelectionStatus){
-        let { currentSummit, currentEventType, currentTrack, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy } = this.props;
+        let { currentSummit, currentEventType, currentTrack, unScheduleEventsCurrentSearchTerm, currentPresentationSelectionPlan, currentUnScheduleOrderBy } = this.props;
         let eventTypeId = currentEventType == null ? null : currentEventType.id;
         let trackId = currentTrack == null ? null : currentTrack.id;
         let order = currentUnScheduleOrderBy;
@@ -282,15 +285,25 @@ class ScheduleAdminDashBoard extends React.Component {
         }
 
         this.props.changeCurrentPresentationSelectionStatus(presentationSelectionStatus);
-        this.props.getUnScheduleEventsPage(currentSummit.id, 1, 20, eventTypeId, trackId, presentationSelectionStatus, unScheduleEventsCurrentSearchTerm, order);
+        this.props.getUnScheduleEventsPage(currentSummit.id, 1, 20, eventTypeId, trackId, presentationSelectionStatus, presentationSelectionPlan, unScheduleEventsCurrentSearchTerm, order);
+    }
+
+    onPresentationSelectionPlanChanged(presentationSelectionPlan){
+        let { currentSummit, currentEventType, currentTrack, currentPresentationSelectionStatus, unScheduleEventsCurrentSearchTerm, currentUnScheduleOrderBy } = this.props;
+        let eventTypeId = currentEventType == null ? null : currentEventType.id;
+        let trackId = currentTrack == null ? null : currentTrack.id;
+        let order = currentUnScheduleOrderBy;
+
+        this.props.changeCurrentPresentationSelectionPlan(presentationSelectionPlan);
+        this.props.getUnScheduleEventsPage(currentSummit.id, 1, 20, eventTypeId, trackId, currentPresentationSelectionStatus, presentationSelectionPlan, unScheduleEventsCurrentSearchTerm, order);
     }
 
     onUnscheduledEventsFilterTextChanged(term){
-        let { currentSummit, currentEventType, currentTrack, currentPresentationSelectionStatus} = this.props;
+        let { currentSummit, currentEventType, currentTrack, currentPresentationSelectionStatus, currentPresentationSelectionPlan} = this.props;
         let eventTypeId = currentEventType == null ? null : currentEventType.id;
         let trackId    = currentTrack == null ? null : currentTrack.id;
         this.props.changeCurrentUnscheduleSearchTerm(term)
-        this.props.getUnScheduleEventsPage(currentSummit.id, 1, 20, eventTypeId, trackId, currentPresentationSelectionStatus, term, 'id');
+        this.props.getUnScheduleEventsPage(currentSummit.id, 1, 20, eventTypeId, trackId, currentPresentationSelectionStatus, currentPresentationSelectionPlan, term, 'id');
     }
 
     onScheduledEventsFilterTextChanged(term){
@@ -411,6 +424,7 @@ class ScheduleAdminDashBoard extends React.Component {
             currentEventType,
             currentTrack,
             currentPresentationSelectionStatus,
+            currentPresentationSelectionPlan,
             unScheduleEventsCurrentSearchTerm,
             unScheduleEventsCurrentPage
         } = this.props;
@@ -426,6 +440,7 @@ class ScheduleAdminDashBoard extends React.Component {
             eventTypeId,
             trackId,
             currentPresentationSelectionStatus,
+            currentPresentationSelectionPlan,
             unScheduleEventsCurrentSearchTerm,
             orderBy
         );
@@ -525,6 +540,7 @@ class ScheduleAdminDashBoard extends React.Component {
             currentEventType,
             currentTrack,
             currentPresentationSelectionStatus,
+            currentPresentationSelectionPlan,
             unScheduleEventsCurrentSearchTerm,
             scheduleEventsCurrentSearchTerm,
             scheduleEventsSearch,
@@ -625,7 +641,11 @@ class ScheduleAdminDashBoard extends React.Component {
             { value : 'lightning-alternate', label: 'Lightning Alternate' },
         ];
 
-        // sort options
+        // selection plan options
+
+        let presentationSelectionPlanOptions = currentSummit.selection_plans.map(sp => ({value: sp.id, label: sp.name}));
+
+            // sort options
 
         let orderByOptions = [
             { value : 'title', label: 'Title' },
@@ -763,35 +783,44 @@ class ScheduleAdminDashBoard extends React.Component {
                         </div>
                     </div>
                     <div className="row">
-                        <div className="col-md-12">
-                            <div className="row">
-                                <div className="col-md-6">
-                                    <ScheduleAdminTrackSelector
-                                        onTrackChanged={this.onTrackChanged}
-                                        tracks={tracks}
-                                        currentValue={currentTrackSelectorItem}
-                                    />
-                                </div>
-                                <div className="col-md-6">
-                                    { currentEventType != null && currentEventType.class_name == "PresentationType" &&
-                                    <ScheduleAdminPresentationSelectionStatusSelector
-                                        presentationSelectionStatus={presentationSelectionStatusOptions}
-                                        onPresentationSelectionStatusChanged={this.onPresentationSelectionStatusChanged}
-                                        currentValue={currentPresentationSelectionStatus}
-                                    />
-                                    }
-                                </div>
-                            </div>
+                        <div className="col-md-6">
+                            <ScheduleAdminTrackSelector
+                                onTrackChanged={this.onTrackChanged}
+                                tracks={tracks}
+                                currentValue={currentTrackSelectorItem}
+                            />
+                        </div>
+                        <div className="col-md-6">
+                            { currentEventType != null && currentEventType.class_name == "PresentationType" &&
+                            <ScheduleAdminPresentationSelectionStatusSelector
+                                presentationSelectionStatus={presentationSelectionStatusOptions}
+                                onPresentationSelectionStatusChanged={this.onPresentationSelectionStatusChanged}
+                                currentValue={currentPresentationSelectionStatus}
+                            />
+                            }
                         </div>
                     </div>
-                    {
-                         ( unScheduleEvents.length > 0) &&
-                         <ScheduleAdminsBulkActionsSelector
-                             bulkOptions={bulkOptionsUnPublished}
-                             onSelectAll={this.onSelectAllUnPublished}
-                             onSelectedBulkAction={this.onSelectedBulkActionUnPublished}
-                        />
-                    }
+                    <div className="row">
+                        <div className="col-md-6">
+                            {unScheduleEvents.length > 0 &&
+                            <ScheduleAdminsBulkActionsSelector
+                                bulkOptions={bulkOptionsUnPublished}
+                                onSelectAll={this.onSelectAllUnPublished}
+                                onSelectedBulkAction={this.onSelectedBulkActionUnPublished}
+                            />
+                            }
+                        </div>
+                        <div className="col-md-6">
+                            { currentEventType != null && currentEventType.class_name == "PresentationType" &&
+                            <ScheduleAdminPresentationSelectionPlanSelector
+                                presentationSelectionPlans={presentationSelectionPlanOptions}
+                                onPresentationSelectionPlanChanged={this.onPresentationSelectionPlanChanged}
+                                currentValue={currentPresentationSelectionPlan}
+                            />
+                            }
+                        </div>
+                    </div>
+
                     <UnScheduleEventList
                             events={unScheduleEvents}
                             currentPage={unScheduleEventsCurrentPage}
@@ -844,6 +873,7 @@ export default connect(mapStateToProps, {
     changeCurrentEventType,
     changeCurrentTrack,
     changeCurrentPresentationSelectionStatus,
+    changeCurrentPresentationSelectionPlan,
     changeCurrentUnscheduleSearchTerm,
     changeCurrentScheduleSearchTerm,
     searchScheduleEvents,
diff --git a/src/components/schedule-builder/schedule-admin-presentation-selection-plan-selector.js b/src/components/schedule-builder/schedule-admin-presentation-selection-plan-selector.js
new file mode 100644
index 000000000..3e137f981
--- /dev/null
+++ b/src/components/schedule-builder/schedule-admin-presentation-selection-plan-selector.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright 2017 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+import React from 'react';
+import Select from 'react-select';
+import T from "i18n-react/dist/i18n-react";
+
+class ScheduleAdminPresentationSelectionPlanSelector extends React.Component {
+
+    constructor(props){
+        super(props);
+        this.onChange = this.onChange.bind(this);
+    }
+
+    onChange(selectedOption){
+        this.props.onPresentationSelectionPlanChanged(selectedOption ? selectedOption.value : null);
+    }
+
+    render(){
+        let { presentationSelectionPlans, currentValue } = this.props;
+        let theValue = presentationSelectionPlans.find(op => op.value == currentValue);
+
+        return (
+            <Select
+                placeholder={T.translate("schedule.placeholders.select_presentation_selection_plan")}
+                className="presentation-selection-plan-selector"
+                name="form-field-name"
+                value={theValue}
+                onChange={this.onChange}
+                options={presentationSelectionPlans}
+                isClearable={true}
+            />
+        )
+    }
+}
+
+export default ScheduleAdminPresentationSelectionPlanSelector;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d71152337..1759c97f8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -129,6 +129,7 @@
     "no_empty_spots"                        : "No empty spots found",
     "placeholders": {
       "select_presentation_selection_status": "Select a Selection Status ...",
+      "select_presentation_selection_plan"  : "Select a Selection Plan ...",
       "search_unpublished"                  : "Search for UnPublished Events ...",
       "search_published"                    : "Search for Published Events ...",
       "select_order_by"                     : "Select Order By ...",
diff --git a/src/layouts/summit-id-layout.js b/src/layouts/summit-id-layout.js
index abb9ea40e..5f31d8a82 100644
--- a/src/layouts/summit-id-layout.js
+++ b/src/layouts/summit-id-layout.js
@@ -17,7 +17,7 @@ import { Switch, Route, Redirect } from 'react-router-dom';
 import { Breadcrumb } from 'react-breadcrumbs';
 import T from "i18n-react/dist/i18n-react";
 
-import { getSummitById, resetSummitForm }  from '../actions/summit-actions';
+import { getSummitById, resetSummitForm, getAllSummits }  from '../actions/summit-actions';
 
 import SummitDashboardPage from '../pages/summits/summit-dashboard-page'
 import EditSummitPage from '../pages/summits/edit-summit-page'
@@ -66,6 +66,9 @@ class SummitIdLayout extends React.Component {
             this.props.resetSummitForm();
         } else {
             this.props.getSummitById(summitId);
+
+            // this is needed for summit dropdown, runs on background
+            this.props.getAllSummits();
         }
     }
 
@@ -146,7 +149,8 @@ export default connect (
     mapStateToProps,
     {
         getSummitById,
-        resetSummitForm
+        resetSummitForm,
+        getAllSummits
     }
 )(SummitIdLayout);
 
diff --git a/src/pages/events/event-category-list-page.js b/src/pages/events/event-category-list-page.js
index 4dad538fa..1e8ba5f24 100644
--- a/src/pages/events/event-category-list-page.js
+++ b/src/pages/events/event-category-list-page.js
@@ -81,9 +81,8 @@ class EventCategoryListPage extends React.Component {
     }
 
     render(){
-        let {currentSummit, eventCategories, summits} = this.props;
-
-        summits = summits.filter(s => s.id != currentSummit.id);
+        let {currentSummit, eventCategories, allSummits} = this.props;
+        const summits = allSummits.filter(s => s.id != currentSummit.id);
 
         let columns = [
             { columnKey: 'id', value: T.translate("general.id") },
@@ -136,7 +135,7 @@ class EventCategoryListPage extends React.Component {
 
 const mapStateToProps = ({ directoryState, currentSummitState, currentEventCategoryListState }) => ({
     currentSummit   : currentSummitState.currentSummit,
-    summits         : directoryState.summits,
+    allSummits      : directoryState.allSummits,
     ...currentEventCategoryListState
 });
 
diff --git a/src/pages/marketing/marketing-setting-list-page.js b/src/pages/marketing/marketing-setting-list-page.js
index 7bb0463c6..0cb8df611 100644
--- a/src/pages/marketing/marketing-setting-list-page.js
+++ b/src/pages/marketing/marketing-setting-list-page.js
@@ -113,7 +113,8 @@ class MarketingSettingListPage extends React.Component {
     }
 
     render(){
-        let {currentSummit, summits, settings, lastPage, currentPage, term, order, orderDir, totalSettings} = this.props;
+        let {currentSummit, allSummits, settings, lastPage, currentPage, term, order, orderDir, totalSettings} = this.props;
+        const summits = allSummits.filter(s => s.id != currentSummit.id);
 
         let columns = [
             { columnKey: 'id', value: T.translate("general.id"), sortable: true },
@@ -193,7 +194,7 @@ class MarketingSettingListPage extends React.Component {
 
 const mapStateToProps = ({ currentSummitState, directoryState, marketingSettingListState }) => ({
     currentSummit   : currentSummitState.currentSummit,
-    summits         : directoryState.summits,
+    allSummits      : directoryState.allSummits,
     ...marketingSettingListState
 })
 
diff --git a/src/pages/media_uploads/media-upload-list-page.js b/src/pages/media_uploads/media-upload-list-page.js
index 062f69a42..f61085e85 100644
--- a/src/pages/media_uploads/media-upload-list-page.js
+++ b/src/pages/media_uploads/media-upload-list-page.js
@@ -93,7 +93,8 @@ class MediaUploadListPage extends React.Component {
     canEdit = (item) => !item.is_system_defined;
 
     render(){
-        let {media_uploads, summits, lastPage, currentPage, term, order, orderDir} = this.props;
+        let {currentSummit, media_uploads, allSummits, lastPage, currentPage, term, order, orderDir} = this.props;
+        const summits = allSummits.filter(s => s.id != currentSummit.id);
 
         let columns = [
             { columnKey: 'id', value: T.translate("general.id"), sortable: true },
@@ -168,7 +169,7 @@ class MediaUploadListPage extends React.Component {
 
 const mapStateToProps = ({ directoryState, currentSummitState, mediaUploadListState }) => ({
     currentSummit   : currentSummitState.currentSummit,
-    summits         : directoryState.summits,
+    allSummits      : directoryState.allSummits,
     ...mediaUploadListState
 })
 
diff --git a/src/reducers/attendees/attendee-reducer.js b/src/reducers/attendees/attendee-reducer.js
index 222c22ed7..e009a8faf 100644
--- a/src/reducers/attendees/attendee-reducer.js
+++ b/src/reducers/attendees/attendee-reducer.js
@@ -78,6 +78,10 @@ const attendeeReducer = (state = DEFAULT_STATE, action) => {
                 }
             }
 
+            if (entity.extra_questions) {
+                entity.extra_questions = entity.extra_questions.map(q => ({question_id: q.question_id, answer: q.value}))
+            }
+
             return {...state,  entity: {...DEFAULT_ENTITY, ...entity}, errors: {} };
         }
         break;
diff --git a/src/reducers/events/event-category-group-reducer.js b/src/reducers/events/event-category-group-reducer.js
index 4f347254a..56a8716d6 100644
--- a/src/reducers/events/event-category-group-reducer.js
+++ b/src/reducers/events/event-category-group-reducer.js
@@ -29,7 +29,7 @@ import { SET_CURRENT_SUMMIT } from '../../actions/summit-actions';
 
 export const DEFAULT_ENTITY = {
     id                              : 0,
-    class_name                      : '',
+    class_name                      : null,
     name                            : '',
     color                           : '',
     description                     : '',
diff --git a/src/reducers/events/schedule-builder-reducer.js b/src/reducers/events/schedule-builder-reducer.js
index d587d6de0..2ba505952 100644
--- a/src/reducers/events/schedule-builder-reducer.js
+++ b/src/reducers/events/schedule-builder-reducer.js
@@ -22,6 +22,7 @@ import
     CHANGE_CURRENT_EVENT_TYPE,
     CHANGE_CURRENT_TRACK,
     CHANGE_CURRENT_PRESENTATION_SELECTION_STATUS,
+    CHANGE_CURRENT_PRESENTATION_SELECTION_PLAN,
     CHANGE_CURRENT_UNSCHEDULE_SEARCH_TERM,
     CHANGE_CURRENT_SCHEDULE_SEARCH_TERM,
     UNPUBLISHED_EVENT,
@@ -50,6 +51,7 @@ const DEFAULT_STATE = {
     currentEventType : null,
     currentTrack : null,
     currentPresentationSelectionStatus: null,
+    currentPresentationSelectionPlan: null,
     unScheduleEventsCurrentSearchTerm: null,
     scheduleEventsCurrentSearchTerm: null,
     scheduleEventsSearch: [],
@@ -86,6 +88,11 @@ const scheduleBuilderReducer = (state = DEFAULT_STATE, action) => {
             return {...state, currentPresentationSelectionStatus : presentationSelectionStatus};
         }
         break;
+        case CHANGE_CURRENT_PRESENTATION_SELECTION_PLAN: {
+            let {presentationSelectionPlan} = payload;
+            return {...state, currentPresentationSelectionPlan : presentationSelectionPlan};
+        }
+        break;
         case RECEIVE_EMPTY_SPOTS:{
             let { data } = payload.response;
             return {...state, emptySpots : data, searchingEmpty: true};
diff --git a/src/reducers/events/summit-event-reducer.js b/src/reducers/events/summit-event-reducer.js
index 3cb540580..315a09eef 100644
--- a/src/reducers/events/summit-event-reducer.js
+++ b/src/reducers/events/summit-event-reducer.js
@@ -18,7 +18,8 @@ import
     UPDATE_EVENT,
     EVENT_UPDATED,
     EVENT_ADDED,
-    EVENT_PUBLISHED
+    EVENT_PUBLISHED,
+    IMAGE_ATTACHED
 } from '../../actions/event-actions';
 
 import { LOGOUT_USER, VALIDATE } from 'openstack-uicore-foundation/lib/actions';
@@ -82,10 +83,10 @@ const summitEventReducer = (state = DEFAULT_STATE, action) => {
         case EVENT_ADDED:
         case RECEIVE_EVENT: {
             let entity = payload.response;
-            let links = [];
-            let videos = [];
-            let slides = [];
-            let media_uploads = [];
+            let links = entity.slides || [];
+            let videos = entity.videos || [];
+            let slides = entity.links || [];
+            let media_uploads = entity.media_uploads || [];
 
             for(var key in entity) {
                 if(entity.hasOwnProperty(key)) {
@@ -95,38 +96,13 @@ const summitEventReducer = (state = DEFAULT_STATE, action) => {
 
             if (!entity.rsvp_external) entity.rsvp_link = null;
 
-            if (entity.links) {
-                links = entity.links.map(l => ({
-                    ...l, name: l.name ? l.name : l.link,
-                    display_on_site_label: l.display_on_site ? 'Yes' : 'No',
-                }));
-            }
-            if (entity.videos) {
-                videos = entity.videos.map(v => ({
-                    ...v,
-                    display_on_site_label: v.display_on_site ? 'Yes' : 'No',
-                }));
-            }
-            if (entity.slides) {
-                slides = entity.slides.map(s => ({
-                    ...s,
-                    display_on_site_label: s.display_on_site ? 'Yes' : 'No',
-                }));
-            }
-            if (entity.media_uploads) {
-                media_uploads = entity.media_uploads.map(mu => {
-                    const type = entity.type.allowed_media_upload_types.find(amu => amu.id === mu.media_upload_type_id);
-                    return {
-                        ...mu,
-                        name: type ? type.name : '',
-                        description: type ? type.description : '',
-                        display_on_site_label: mu.display_on_site ? 'Yes' : 'No',
-                    };
-                });
-            }
-
             entity.materials = [...media_uploads, ...links, ...videos, ...slides];
 
+            entity.materials.forEach(m => ({
+                ...m,
+                display_on_site_label: m.display_on_site ? 'Yes' : 'No',
+            }));
+
             return {...state, entity: {...state.entity, ...entity}, errors: {} };
         }
         break;
@@ -151,11 +127,6 @@ const summitEventReducer = (state = DEFAULT_STATE, action) => {
         break;
         case EVENT_MATERIAL_ADDED: {
             let newMaterial = {...payload.response};
-            if (newMaterial.class_name === 'PresentationMediaUpload') {
-                const type = state.entity.type.allowed_media_upload_types.find(amu => amu.id === newMaterial.media_upload_type_id);
-                newMaterial.name = type ? type.name : '';
-                newMaterial.description = type ? type.description : '';
-            }
 
             newMaterial.display_on_site_label = (newMaterial.display_on_site) ? 'Yes' : 'No';
 
@@ -168,12 +139,6 @@ const summitEventReducer = (state = DEFAULT_STATE, action) => {
             let newMaterial = {...payload.response};
             let oldMaterials = state.entity.materials.filter(m => m.id != newMaterial.id);
 
-            if (newMaterial.class_name === 'PresentationMediaUpload') {
-                const type = state.entity.type.allowed_media_upload_types.find(amu => amu.id === newMaterial.media_upload_type_id);
-                newMaterial.name = type ? type.name : '';
-                newMaterial.description = type ? type.description : '';
-            }
-
             newMaterial.display_on_site_label = (newMaterial.display_on_site) ? 'Yes' : 'No';
 
             let materials = [...oldMaterials, newMaterial];
@@ -181,6 +146,12 @@ const summitEventReducer = (state = DEFAULT_STATE, action) => {
             return {...state, entity: {...state.entity, materials: materials}, errors: {} };
         }
         break;
+        case IMAGE_ATTACHED: {
+            let image = {...payload.response};
+            //let image = {...state.entity.image, url:  state.entity.image.url + '?' + new Date().getTime()};
+            return {...state, entity: {...state.entity, image: image.url} };
+        }
+            break;
         case VALIDATE: {
             return {...state,  errors: payload.errors };
         }
diff --git a/src/reducers/summits/directory-reducer.js b/src/reducers/summits/directory-reducer.js
index 8d9e7d56a..5d0dd2e8f 100644
--- a/src/reducers/summits/directory-reducer.js
+++ b/src/reducers/summits/directory-reducer.js
@@ -1,8 +1,9 @@
-import { RECEIVE_SUMMITS, SUMMIT_ADDED, SUMMIT_DELETED } from '../../actions/summit-actions';
+import {RECEIVE_ALL_SUMMITS, RECEIVE_SUMMITS, SUMMIT_ADDED, SUMMIT_DELETED} from '../../actions/summit-actions';
 import{ LOGOUT_USER } from 'openstack-uicore-foundation/lib/actions';
 
 const DEFAULT_STATE = {
     summits      : [],
+    allSummits      : [],
     currentPage  : 1,
     lastPage     : 1,
     perPage      : 10,
@@ -17,6 +18,11 @@ const directoryReducer = (state = DEFAULT_STATE, action) => {
             return {...state, summits: data, currentPage: current_page, lastPage: last_page, totalSummits: total};
         }
         break;
+        case RECEIVE_ALL_SUMMITS: {
+            let { data } = payload.response;
+            return {...state, allSummits: data};
+        }
+        break;
         case SUMMIT_ADDED: {
             let { response } = payload;
 
diff --git a/src/styles/general.less b/src/styles/general.less
index b8e397e20..c479b9f5b 100644
--- a/src/styles/general.less
+++ b/src/styles/general.less
@@ -106,6 +106,7 @@ h3 {
 
 .selected-files {
   .file-box {
+    max-height: 100px;
     max-width: 80px;
     overflow: hidden;
     text-overflow: ellipsis;