tab icons added, things cleaned up