More design enhancements