CSS & JS Fixes - Shaun