#469 Improve navbar design and other changes