layout fixes, color table