Some updates for visual styling