More progress on the layout update. Index.html is broken at the moment