More display/layout fixes