various clean-up + layout enhancements