added icons for status and cleaned things up a bit