border fixed + minor color changes