@khaleelkazi: Big UX improvement