much work

improved in battle menu
changed water behavior with action bar