Minor layout enhancements