Options page reworked