Fix linking between buttons and layouts