Improve buttons and bottom links