Minor UI Change & Bug fix