Improved positioning and colors/borders