updated more layout