Improve Info Tabs & Minor Cleanup