Subject scope back on work and various small layout fixes