Update feature: More minor design additions and fixes