Orderable config options, and some variable name cleanups
Better config UI