Added green buttons and reorganized tree