#330 Updated layout transistions
#330 Fixed tree layouts
#330 Missed some commits because I didn't pull prior to merging. I might have broken something. Here is the missing commits merged.