Fix bugs and make a UI revamp to finish the project