Improved colors, fixed ID padding