Some formatting and visibility changes.