Added a Content Tab
Cleaned up some code for better reuse