Major Fixes in Activities