Little design enchancements