easier tab navigation
fixed missing functions include