More redesign work, including some small redmine issues.