Update some stuff
Fix #402.
Inner fragment for PreferenceScreen not fully done, removed