Layout changes

Beginnings of layout implementation