Mostly GUI fixing. Started on implementation of battles, map console