Some styling updates and minor additional functionality.