improved tab navigation and buttons