Fixing more layout problems