fix layout, fix url