updated(fixed) layout