Pull current buttons into helper
tab->space cleanup