Settings page reworked