More styles
Battle Page fixes
Merge branch 'master' of https://github.com/makkarlabs/FTL
Index reverted