Minor UI issues solved