Fix #43 remove the redundant buttons and make it part of toolbar template