tab fix
Merge origin/master
last tab and render fixes