Continuing to revamp UI