Improve UX flow, make that shit look more professional