#23 CSS improvements