Minor UI changes + clearer status messages