Correct more links and layout pages