Removed magic strings from TrayClass