Major graphics and code overhaul