UI revamp and many fixes