Fix battlelist square bug / Cleanup