Added borders and colors