Component tray fixes