Added borders in UI