Snapping + hacky but improved visualization