#1102 and #1212 - CSS issues