Modified UI of Advanced options #118