Removed unnecessary stuff, fixed the flat tree layout