layout and functionality enhancements