Minor layout modifications