More visual changes - Still need map and commenting