Base fix and settings modal attempt (try 1)
And forgot to update views/settings :p
try 2
GRRR the person who put the } in the wrong place