Revert 9ea3a59..f04e9b7

This rolls back to commit 9ea3a59cb641410900a0fdc9ed58acd411d46ae3.
Revert "New layouts"

Conflicts:
	index.js