Minor improvements; back to separate Results / Discussion layout