Base fix and settings modal attempt (try 1)