refacor and clean up

small changes to clean up the UI and inform the user