Some miscellaneous edits for targeting, added in dynamic visible index positions for the demo during arrangement