move includes and loading statemekt
Merge remote-tracking branch 'coyotte/design' into design
more battle window design