cleaned up and added icons