#48: layout fixes