added layout.html and cleanup