fixing more layout issues