Add better offsets for shapes