got as far as I can without the layout issue being resolved