more layout and css fix