JS updates and html/css refactors