more markup and layout stuff