merged the files with latest UI