New UI for combat and some bug fixes!

I hear some feedback from some friends saying that the combat was confusing, so I added a better and more intuitive UI, I hope this fix a lot of problems people have playing the game!  I know there are some issues left so I will keep working on it

Before:

Now: