fix links
update layout