reorganized buttons