Now uses new constants
small layout stuff