layout almost done

....