Layout, interaction improvements