Refactored scripts and aligned menu options