Rearrange the Tree, Fixed some Bugs, Chnaged the Views