added fixes to dynamic side menu that were in master