layout modified. bug fix.