Updated Tray.
Some refactors.