Refactor. Reorganise settings page