Complete menu functionality (except for transitions)
Solve merge problem