- changed link to buttons, changed dependend layout