Got tabview working
Fix merge issues