Fixes #10 by changing the UI for the different states