Break up CaptureActivity into something less monolithic
WIP slight bugfix