Options and settings sup page fixes