Restructured options pages