Clean-up and reorganise capture form
Added regions
Clean-up and reorganise Options class