UI changes
cleanup
Updated version