Added tabs, enlarged panel for 'Advanced' options