Updated changes from Adam
CSS & JS Cleanified