use grass blocks for navbar
merge?
fix bad merge