Clean up Layout and index.html