Design fixes and cleanup