#546 css/layout