added button in navbar, fix found bugs