Improvements to the UI
Minor fixes
Added spinner and minor UI improvements