Added aiming and refactored cell drawing logic