Add progress bar, tabs and improve user experience