Improve buttons

Work in progress.
Improve buttons (continued)