Add status images, clean up unused variables