Version 2.1 design edits