Adding Audio Support & Refactoring Menu Layer