Add default buttons
Fix navigation