Minor UI cleanups, make spacing and border colors consistent