Updated modal and api updates from master