Layout and index tweaks