Several minor quirks w 2.1.1; rename tables needed _ separator; bad controller instantiation, inaccurate format update login expanded view
(cherry picked from commit 20d09f3143b333ea83b50f6b7ee2d8e1792bd751)