restructure buttons