ongoing menu/gallery work
merge confict fixed