css/js restructuring