Makes the user settings panel useful for settings of all sorts, too. Change-Id: I88d68b888842c21ba168beaae0b991789a8f8072