Vishal #0 fixing ui border elements