Navbar enhancements
Removed before and after blocks from datastore