Cleaned up and re-organized CSS and JS