Minor clean-up
Added other kinds of buttons