Cleaned up, added styles for table