UX Enhancement & add more mids