diff --git a/Classes/Swift/Conference/ViewModels/ScheduledConferencesViewModel.swift b/Classes/Swift/Conference/ViewModels/ScheduledConferencesViewModel.swift
index 005651614..9de2afc4f 100644
--- a/Classes/Swift/Conference/ViewModels/ScheduledConferencesViewModel.swift
+++ b/Classes/Swift/Conference/ViewModels/ScheduledConferencesViewModel.swift
@@ -50,7 +50,7 @@ class ScheduledConferencesViewModel  {
 		conferences.value!.removeAll()
 		let now = Date().timeIntervalSince1970 // Linphone uses time_t in seconds
 		let oneHourAgo = now - 3600 // Show all conferences from 1 hour ago and forward
-		core.getConferenceInformationListAfterTime(time: time_t(oneHourAgo)).forEach { conferenceInfo in
+		core.getConferenceInformationListAfterTime(time: time_t(oneHourAgo)).filter{$0.duration != 0}.forEach { conferenceInfo in
 			conferences.value!.append(ScheduledConferenceData(conferenceInfo: conferenceInfo))
 		}
 		
diff --git a/Classes/Swift/Util/BackNextNavigationView.swift b/Classes/Swift/Util/BackNextNavigationView.swift
index ca61e6b20..6bb4af676 100644
--- a/Classes/Swift/Util/BackNextNavigationView.swift
+++ b/Classes/Swift/Util/BackNextNavigationView.swift
@@ -29,6 +29,7 @@ import linphonesw
 	let top_bar_height = 66.0
 	let navigation_buttons_padding = 18.0
 	let content_margin_top = 20
+	let side_buttons_margin = 5
 	
 	// User by subviews
 	let form_margin = 10.0
@@ -58,11 +59,11 @@ import linphonesw
 		topBar.alignParentTop().height(top_bar_height).matchParentSideBorders().done()
 		
 		topBar.addSubview(backButton)
-		backButton.alignParentLeft().matchParentHeight().done()
+		backButton.alignParentLeft(withMargin: side_buttons_margin).matchParentHeight().done()
 		backButton.onClickAction = backAction
 		
 		topBar.addSubview(nextButton)
-		nextButton.alignParentRight().matchParentHeight().done()
+		nextButton.alignParentRight(withMargin: side_buttons_margin).matchParentHeight().done()
 		nextButton.onClickAction = nextAction
 		nextActionEnableCondition.readCurrentAndObserve { (enableNext) in
 			self.nextButton.isEnabled = enableNext == true