fixes sorting
fixes dependent destroy 114
Merge branch 'feature/menu-104' into staging