Improving UI, and minor bug fixes
removing test code