Cleaned up id names and cleaned up main.js