Admin JS Bug Fixes