Option Screen Bug Fixes

Needs to all be cleaned up and old code / data removed from previous battle screens