use reasonable layout
Merge branch 'master' into arch

Conflicts:
	exz/startup.lua