Refactored css and js to remove static class variable