Some minor Fixes

Username now saves; toggle switches added