Uploading new ui files with several bug fixes