Added borders and colors on widgets