Subitems and layout tweaks