fixed empty error and added red/yellow classes