Finished UI revamp