Fixing style issues and mergin script for menu