Some more layout switching + CSS tweaking