Added various GUI bugfixes and batting bug
Ignore commit
Merge