Adjusted some minor design items.