Simplfiying the scripts a bit to keep make the toolbar have seperate concerns