Final Ajax Fixes