Clean code up, fix bug when selecting Service Options page