new files from uibinder branch