Cleaning up random yellow bar and adding alerts