Reorganize Capture Dialog layout

Change-Id: Iafe20f3a8509c83e821ce4abc9bd91bd1bb002dd