Restore deleted UI files and Bugs fixed