Added some stuff to schema, added names to layout.html