Edited controller and activities to use new controller methods