Some of the UI and other code changes + fixes due to the 1st pull request comments