UI revamped and other changes