minor changes to layout and indexes