Status indicators and misc cleanup