Large amount of changes.

Rebuilding Menu