Partially done: Settings page improved

Now we store the settings the user choose