Minor layout improvements