Logic Fixes

Fixed add Admin Logic
Logic Changes

More Logic Changes and Such
Conflict