Cleaned up code. Created separate widget classes for widget content export.