Added GUI stuff and made capture device fix in vision
Merged conflict hopefully resolved