layout improvements and renamed Node=>Tab