Numerous UI improvements / bug fixes