Add more contrast in grids Fix buttons border colors