Improve Navbar and add Alert.