Commit 7.1

Minor design tweaks