tank gui & misc refactorings