More clean up

Removed unused dependencies
Moved menu to application layout