Fixed not working at all, also fixed Options page