Improve the UI

This commit changes 2 things:

1) cleaner user interface
2) add 'retry' option even when the provided submission was correct