integrating css and script changes between master and script branch