Restructure buttons