Added additional buttons. Fixed 'tab' behavior