Adding some stuff to make the UX a bit more fluid