added border radius and remove function enclosure