#670 Improve navbar style and text, add button
#696 Add support for all buttons