Minor bug fixes, TabViews Added