more layout stuff
added doctrine