Update small design issues, add circles