Some cleanup and some visual changes to the capture interface