Sipho mods

Sipho layout mods

Everything filed under layout by its own author, ordered by how much it is used.