Added menu entries and code re-factoring