Upgraded UI to flow better