Better movement + rendering