Options page fixes