Added Custom Buttons with TapCommand