ticket:73 more changes in layouts