Fixed the loop
Made some minor UX improvements