Rearranged stuff, added tray