Fixed buttons and and missing urls