Updated main files and UI