Had to make some minor changes to have a more fluid ui and user feedback